This repository has been archived by the owner on Dec 18, 2018. It is now read-only.
Update to new corefx #1561
Merged
Update to new corefx #1561
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pakrym
requested review from
analogrelay,
davidfowl,
mikaelm12 and
BrennanConroy
analogrelay
approved these changes
Mar 8, 2018
| @@ -143,7 +144,7 @@ public WebSocketsTransport(WebSocketOptions options, IDuplexPipe application, De | |||
| #if NETCOREAPP2_1 | |||
| var receiveResult = await socket.ReceiveAsync(memory, CancellationToken.None); | |||
| #else | |||
| var isArray = memory.TryGetArray(out var arraySegment); | |||
| var isArray = MemoryMarshal.TryGetArray<byte>(memory, out var arraySegment); | |||
There was a problem hiding this comment.
Is the <byte> not inferrable?
There was a problem hiding this comment.
The first parameter type is ReadOnlyMemory, it's either inference or implicit conversion, unfortunately.
|
I hope so, it contains the fix for the issue OSX we reported. We'll see if it works :) |
BrennanConroy
approved these changes
Mar 8, 2018
| @@ -367,7 +367,7 @@ private static Uri CreateConnectUrl(Uri url, string connectionId) | |||
| private async Task StartTransport(Uri connectUrl, TransportType transportType) | |||
| { | |||
|
|
|||
| var options = new PipeOptions(readerScheduler: PipeScheduler.ThreadPool); | |||
| var options = new PipeOptions(writerScheduler:PipeScheduler.Inline, readerScheduler: PipeScheduler.ThreadPool, useSynchronizationContext: false); | |||
pakrym
force-pushed
the
feature/pk-corefx0
branch
from
6524e37 to
58772ef
Compare
davidfowl
reviewed
Mar 8, 2018
| { | ||
| _pipeWriter.Write(source.Span); | ||
| _length += source.Length; | ||
| return Task.CompletedTask; | ||
| return new ValueTask(Task.CompletedTask); |
davidfowl
reviewed
Mar 8, 2018
| @@ -20,7 +20,7 @@ public static Task SendAsync(this WebSocket webSocket, ReadOnlySequence<byte> bu | |||
| #if NETCOREAPP2_1 | |||
| if (buffer.IsSingleSegment) | |||
| { | |||
| return webSocket.SendAsync(buffer.First, webSocketMessageType, endOfMessage: true, cancellationToken); | |||
| return webSocket.SendAsync(buffer.First, webSocketMessageType, endOfMessage: true, cancellationToken).AsTask(); | |||
There was a problem hiding this comment.
Make this method return ValueTask.
|
Super small set of changes. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.